From: Po Lu <luangruo@yahoo.com>
Date: Thu, 3 Mar 2022 03:16:25 +0000 (+0800)
Subject: Fix Motif build without toolkit scroll bars
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2484
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=39aac09940fa3710302819f9395fe83aa9a5f708;p=emacs.git

Fix Motif build without toolkit scroll bars

* src/xterm.c: Always include Xm.h on Motif.
---

diff --git a/src/xterm.c b/src/xterm.c
index 47f9d31ad44..6489a18f904 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -597,13 +597,15 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <cairo-xlib.h>
 #endif
 
+#ifdef USE_MOTIF
+#include <Xm/Xm.h>
+#endif
+
 #ifdef USE_X_TOOLKIT
 
 /* Include toolkit specific headers for the scroll bar widget.  */
-
 #ifdef USE_TOOLKIT_SCROLL_BARS
 #if defined USE_MOTIF
-#include <Xm/Xm.h>		/* For LESSTIF_VERSION */
 #include <Xm/ScrollBar.h>
 #else /* !USE_MOTIF i.e. use Xaw */